fix promise order